From feddf5a6943872f948ace6e48713aa22e7d34697 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 12 Apr 2019 17:58:53 +0100 Subject: [PATCH] =?utf8?q?Detect=20CUPS=20=E2=89=A5=201.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We support CUPS ≥ 1.2, but we use API that was introduced and deprecated at a later point. --- config.h.meson | 3 +++ modules/printbackends/meson.build | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config.h.meson b/config.h.meson index 74a90d3df8..b792b4ae93 100644 --- a/config.h.meson +++ b/config.h.meson @@ -27,6 +27,9 @@ /* Define to 1 if CUPS 1.6 API is available */ #mesondefine HAVE_CUPS_API_1_6 +/* Define to 1 if CUPS 2.0 API is available */ +#mesondefine HAVE_CUPS_API_2_0 + /* Define to 1 if you have the `dcgettext' function. */ #mesondefine HAVE_DCGETTEXT diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build index 0e26d829f9..00ee33a80d 100644 --- a/modules/printbackends/meson.build +++ b/modules/printbackends/meson.build @@ -30,6 +30,9 @@ if enable_cups if cups_major_version > 1 or cups_minor_version >= 6 cdata.set('HAVE_CUPS_API_1_6', 1) endif + if cups_major_version > 1 or cups_minor_version >= 7 + cdata.set('HAVE_CUPS_API_2_0', 1) + endif if cc.compiles('#include \n http_t http; char *s = http.authstring;') cdata.set('HAVE_HTTP_AUTHSTRING', 1, -- 2.30.2